From 9c57b96f56829be4454d144a25750100745cb675 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 11 Apr 2012 16:04:46 +0200 Subject: [PATCH] animation: Add CSS transition object This is an implementation of GtkStyleAnimation for CSS transitions. Again, this doesn't do anything but store the data needed to do the transition. --- gtk/Makefile.am | 2 + gtk/gtkcsstransition.c | 131 ++++++++++++++++++++++++++++++++++ gtk/gtkcsstransitionprivate.h | 67 +++++++++++++++++ 3 files changed, 200 insertions(+) create mode 100644 gtk/gtkcsstransition.c create mode 100644 gtk/gtkcsstransitionprivate.h diff --git a/gtk/Makefile.am b/gtk/Makefile.am index f8e4c32c13..c5a2faaa5c 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -456,6 +456,7 @@ gtk_private_h_sources = \ gtkcssstringvalueprivate.h \ gtkcssstylefuncsprivate.h \ gtkcssstylepropertyprivate.h \ + gtkcsstransitionprivate.h \ gtkcsstypedvalueprivate.h \ gtkcssvalueprivate.h \ gtkcustompaperunixdialog.h \ @@ -672,6 +673,7 @@ gtk_base_c_sources = \ gtkcssstylefuncs.c \ gtkcssstyleproperty.c \ gtkcssstylepropertyimpl.c \ + gtkcsstransition.c \ gtkcsstypedvalue.c \ gtkcssvalue.c \ gtkcsstypes.c \ diff --git a/gtk/gtkcsstransition.c b/gtk/gtkcsstransition.c new file mode 100644 index 0000000000..79b803d93d --- /dev/null +++ b/gtk/gtkcsstransition.c @@ -0,0 +1,131 @@ +/* + * Copyright © 2012 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + * + * Authors: Benjamin Otte + */ + +#include "config.h" + +#include "gtkcsstransitionprivate.h" + +#include "gtkcsseasevalueprivate.h" + +G_DEFINE_TYPE (GtkCssTransition, _gtk_css_transition, GTK_TYPE_STYLE_ANIMATION) + +static GtkBitmask * +gtk_css_transition_set_values (GtkStyleAnimation *animation, + GtkBitmask *changed, + gint64 for_time_us, + GtkCssComputedValues *values) +{ + GtkCssTransition *transition = GTK_CSS_TRANSITION (animation); + GtkCssValue *value; + double progress; + + if (transition->start_time >= for_time_us) + value = _gtk_css_value_ref (transition->start); + else if (transition->end_time <= for_time_us) + value = _gtk_css_value_ref (transition->end); + else + { + progress = (double) (for_time_us - transition->start_time) / (transition->end_time - transition->start_time); + progress = _gtk_css_ease_value_transform (transition->ease, progress); + + value = _gtk_css_value_transition (transition->start, + transition->end, + progress); + if (value == NULL) + value = _gtk_css_value_ref (transition->end); + } + + _gtk_css_computed_values_set_value (values, transition->property, value, NULL); + _gtk_css_value_unref (value); + + return _gtk_bitmask_set (changed, transition->property, TRUE); +} + +static gboolean +gtk_css_transition_is_finished (GtkStyleAnimation *animation, + gint64 at_time_us) +{ + GtkCssTransition *transition = GTK_CSS_TRANSITION (animation); + + return at_time_us >= transition->end_time; +} + +static void +gtk_css_transition_finalize (GObject *object) +{ + GtkCssTransition *transition = GTK_CSS_TRANSITION (object); + + _gtk_css_value_unref (transition->start); + _gtk_css_value_unref (transition->end); + _gtk_css_value_unref (transition->ease); + + G_OBJECT_CLASS (_gtk_css_transition_parent_class)->finalize (object); +} + +static void +_gtk_css_transition_class_init (GtkCssTransitionClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkStyleAnimationClass *animation_class = GTK_STYLE_ANIMATION_CLASS (klass); + + object_class->finalize = gtk_css_transition_finalize; + + animation_class->set_values = gtk_css_transition_set_values; + animation_class->is_finished = gtk_css_transition_is_finished; +} + +static void +_gtk_css_transition_init (GtkCssTransition *transition) +{ +} + +GtkStyleAnimation * +_gtk_css_transition_new (guint property, + GtkCssValue *start, + GtkCssValue *end, + GtkCssValue *ease, + gint64 start_time_us, + gint64 end_time_us) +{ + GtkCssTransition *transition; + + g_return_val_if_fail (start != NULL, NULL); + g_return_val_if_fail (end != NULL, NULL); + g_return_val_if_fail (ease != NULL, NULL); + g_return_val_if_fail (start_time_us <= end_time_us, NULL); + + transition = g_object_new (GTK_TYPE_CSS_TRANSITION, NULL); + + transition->property = property; + transition->start = _gtk_css_value_ref (start); + transition->end = _gtk_css_value_ref (end); + transition->ease = _gtk_css_value_ref (ease); + transition->start_time = start_time_us; + transition->end_time = end_time_us; + + return GTK_STYLE_ANIMATION (transition); +} + +guint +_gtk_css_transition_get_property (GtkCssTransition *transition) +{ + g_return_val_if_fail (GTK_IS_CSS_TRANSITION (transition), 0); + + return transition->property; +} diff --git a/gtk/gtkcsstransitionprivate.h b/gtk/gtkcsstransitionprivate.h new file mode 100644 index 0000000000..c8af3fce91 --- /dev/null +++ b/gtk/gtkcsstransitionprivate.h @@ -0,0 +1,67 @@ +/* + * Copyright © 2012 Red Hat Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see . + * + * Authors: Benjamin Otte + */ + +#ifndef __GTK_CSS_TRANSITION_PRIVATE_H__ +#define __GTK_CSS_TRANSITION_PRIVATE_H__ + +#include "gtkstyleanimationprivate.h" + +G_BEGIN_DECLS + +#define GTK_TYPE_CSS_TRANSITION (_gtk_css_transition_get_type ()) +#define GTK_CSS_TRANSITION(obj) (G_TYPE_CHECK_INSTANCE_CAST (obj, GTK_TYPE_CSS_TRANSITION, GtkCssTransition)) +#define GTK_CSS_TRANSITION_CLASS(cls) (G_TYPE_CHECK_CLASS_CAST (cls, GTK_TYPE_CSS_TRANSITION, GtkCssTransitionClass)) +#define GTK_IS_CSS_TRANSITION(obj) (G_TYPE_CHECK_INSTANCE_TYPE (obj, GTK_TYPE_CSS_TRANSITION)) +#define GTK_IS_CSS_TRANSITION_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE (obj, GTK_TYPE_CSS_TRANSITION)) +#define GTK_CSS_TRANSITION_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CSS_TRANSITION, GtkCssTransitionClass)) + +typedef struct _GtkCssTransition GtkCssTransition; +typedef struct _GtkCssTransitionClass GtkCssTransitionClass; + +struct _GtkCssTransition +{ + GtkStyleAnimation parent; + + guint property; + GtkCssValue *start; + GtkCssValue *end; + GtkCssValue *ease; + gint64 start_time; + gint64 end_time; +}; + +struct _GtkCssTransitionClass +{ + GtkStyleAnimationClass parent_class; +}; + +GType _gtk_css_transition_get_type (void) G_GNUC_CONST; + +GtkStyleAnimation * _gtk_css_transition_new (guint property, + GtkCssValue *start, + GtkCssValue *end, + GtkCssValue *ease, + gint64 start_time_us, + gint64 end_time_us); + +guint _gtk_css_transition_get_property (GtkCssTransition *transition); + +G_END_DECLS + +#endif /* __GTK_CSS_TRANSITION_PRIVATE_H__ */ -- 2.30.2